bitkeeper revision 1.1159.1.99 (412b0f11cFbfdCRdP2-GJYp0ANDfUA)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 24 Aug 2004 09:49:05 +0000 (09:49 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 24 Aug 2004 09:49:05 +0000 (09:49 +0000)
commitb480e23d76062cd442beee1d4c268884dec22a0f
treef3061fa7207212678b0945716e9fd27121e3255d
parentc8a07c77c04c5e6e7c85ab774605fa963aff3d3d
parenta51ed685b8017af8857fc76a4f3a7e1bc0599ebb
bitkeeper revision 1.1159.1.99 (412b0f11cFbfdCRdP2-GJYp0ANDfUA)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xeno
linux-2.4.27-xen-sparse/arch/xen/kernel/ldt.c
linux-2.4.27-xen-sparse/arch/xen/kernel/traps.c
linux-2.4.27-xen-sparse/include/asm-xen/pgalloc.h
linux-2.4.27-xen-sparse/include/asm-xen/pgtable.h
linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/pgtable.h